Use GDK symbolic names for button numbers

diff --git a/gtk/deprecated/gtkhandlebox.c b/gtk/deprecated/gtkhandlebox.c
index 2fca141277dbd1913d4c7ad736835359476a0b66..b745200c1bf0649c3219a380a9a6cb2955172fee 100644 (file)
--- a/gtk/deprecated/gtkhandlebox.c
+++ b/gtk/deprecated/gtkhandlebox.c
@@ -1221,7 +1221,7 @@ gtk_handle_box_button_press (GtkWidget      *widget,
   handle_position = effective_handle_position (hb);
 
   event_handled = FALSE;
-  if ((event->button == 1) && 
+  if ((event->button == GDK_BUTTON_PRIMARY) &&
       (event->type == GDK_BUTTON_PRESS || event->type == GDK_2BUTTON_PRESS))
     {
       GtkWidget *child;

diff --git a/tests/testgtk.c b/tests/testgtk.c
index d6f13cf3dae89eeed903a135e83a3c5cd6978670..e6310ea25f0133a0aa486f55409f9132d7064049 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -2119,11 +2119,11 @@ grippy_button_press (GtkWidget *area, GdkEventButton *event, GdkWindowEdge edge)
 {
   if (event->type == GDK_BUTTON_PRESS) 
     {
-      if (event->button == 1)
+      if (event->button == GDK_BUTTON_PRIMARY)
        gtk_window_begin_resize_drag (GTK_WINDOW (gtk_widget_get_toplevel (area)), edge,
                                      event->button, event->x_root, event->y_root,
                                      event->time);
-      else if (event->button == 2)
+      else if (event->button == GDK_BUTTON_MIDDLE)
        gtk_window_begin_move_drag (GTK_WINDOW (gtk_widget_get_toplevel (area)), 
                                    event->button, event->x_root, event->y_root,
                                    event->time);

diff --git a/tests/testinput.c b/tests/testinput.c
index 8bea4749d13e23761d4c8e6d310d555fe9f95d80..957e6ae122d3a3380a427a7e43bcf0ab406c967d 100644 (file)
--- a/tests/testinput.c
+++ b/tests/testinput.c
@@ -181,7 +181,8 @@ button_press_event (GtkWidget *widget, GdkEventButton *event)
   current_device = event->device;
   cursor_proximity = TRUE;
 
-  if (event->button == 1 && surface != NULL)
+  if (event->button == GDK_BUTTON_PRIMARY &&
+      surface != NULL)
     {
       gdouble pressure = 0.5;